98909d
@@ -840,7 +840,13 @@
public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
 
     @Override
     protected void doStop() throws Exception {
-        ServiceHelper.stopServices(deadLetter, output, outputAsync);
+        // noop, do not stop any services which we only do when shutting down
+        // as the error handler can be context scoped, and should not stop in case
+        // a route stops
     }
 
+    @Override
+    protected void doShutdown() throws Exception {
+        ServiceHelper.stopServices(deadLetter, output, outputAsync);
+    }
 }
